Merge "Do not show padlock when charging" into qt-dev
am: eafecea0ff

Change-Id: Ic72221207b281d41286459d9d95a5c55c5ff944a