Merge "Migrate existing 4x5 and 4x4 grid users to a new 4x5 grid." into sc-dev