Merge "Hide padlock when launching camera" into qt-dev