Merge "Remove temp logic added to migrate users to new 4x5 grid." into sc-dev