Merge "Remember original orientation in size compat mode." into tm-dev