Merge "Fix two bugs with rotation in split select state" into tm-qpr-dev