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