Merge "Hide Keyguard view after remote animation" into sc-v2-dev