Merge "Merge "Made sure the the lock icon hides again when dragging down" into qt-r1-dev am: 005a5d27 am: b00757ea" into qt-qpr1-dev-plus-aosp