Merge "Make grid size migration less confusing for users." into tm-qpr-dev