Merge "[automerger skipped] Merge "Add restriction grace period for sensitive process-states" into main am: d0298996d6 am: 5cd22cad97 -s ours" into main