Merge "Fix grid layout problem after going back from split select" into sc-v2-dev