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