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

Change-Id: Ief21d52fd736b4007a9596eb747e0d6d9afb675d