Merge "Fixes bad PIP state when opening Maps from the lock screen" into udc-dev