am 435a1dfb: Merge "Fix weird case of multi cell icons" into mnc-dev

* commit '435a1dfbd67371849c60ecd46df1d82a0f496cd8':
  Fix weird case of multi cell icons