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

Change-Id: I5d039dc67926e73efb866df0acc9aed37f2a3b6b