Merge "Fix weird case of multi cell icons" into mnc-dev