Merge "Show open padlock when keyguard is hidden" into qt-dev
am: 063483c189

Change-Id: Ic4fe001e382d33210974eb92b46cb6d39e2a8cf1