Merge "Fixes bug where the camera app would launch below the lock-screen" into tm-qpr-dev