Merge "Fix battery content description when there is no percent mode" into qt-dev