Merge "Fix issue where hotseat apps don't migrate to the new grid" into main