Merge "Fix crash when restoring data from phone to tablet with responsive grid" into main