Merge "Remove force transition logic when keyguard is occluded." into sc-v2-dev