Merge "Fixing regression in entering PiP over keyguard."