Merge "Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"" into sc-v2-dev