Merge "Fix grid selection be cleared if rotate screen at multi-pane device" into sc-v2-dev