Merge "Avoid unnecessary badging" into qt-dev
am: 501152f974

Change-Id: I5e5ae90d4ac1cacf952f66d29333c3ca25b7f515