am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '8dc2ca68c1ccf1570caec3e52c2671b323cf7102':
  Don't lose icons when migrating from different-sized hotseats.