Merge "Scale Icon badges for shortcut and widgets" into ub-launcher3-qt-future-dev
am: f2d486e5b0

Change-Id: I5c2c115b1ee42489d969ff30c48abf00d4a5a3f7