Merge "Allow rotations to portrait on unlocking when unfolded" into tm-qpr-dev