Merge "Update battery content description." into qt-dev