Merge "Workaround: don't migrate grid when hotseat size or device type changes in multi display" into sc-v2-dev