Merge "Animate padlock when waking up" into qt-dev