Merge "Update wirelessly charging text on lockscreen" into qt-dev