Merge "Don't lose icons when migrating from different-sized hotseats." into ub-now-lunchbox