Merge "Cancel authentication when secure camera is launched on Keyguard" into qt-r1-dev