am bfbd52a5: am eac828e0: Merge "Don\'t lose icons when migrating from different-sized hotseats." into ub-now-lunchbox

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