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

Change-Id: I2a54a8ed0ca750bb173e639b4d8bff8e0fc4d3b2