Merge "Camera: Handle keys only while in app" into cm-11.0