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

Change-Id: Ifadfe89323b13d776dab4c3b99a31d7a36d0d021