Merge "Move padlock to the top of the lock screen" into qt-dev