Merge "ic_corp_badge shape change on adaptive icon shape change" into qt-dev