Merge "Avoid unnecessary badging" into qt-dev