Merge "Re-prioritize keyguard visibility animation logic" into sc-v2-dev