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