Merge "Made sure the the lock icon hides again when dragging down" into qt-r1-dev