Merge "Fix UI overlap when rotating in split select mode" into tm-dev