Merge "Merge "Made sure the the lock icon hides again when dragging down" into...
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
am: 4075363e
Change-Id: If7fa58dcce53df59657b9c765b102432d30fa0b2