Merge "Adding back icon size dimen" into ub-launcher3-burnaby