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

Change-Id: Ib53e911dc0af2b242007fb0be016b67d2c0d8240