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

Change-Id: I1303877c07ea567d06b3a46db5ffbc2d9dc5347a