Merge "Improve rotationForActivityInDifferentOrientation." into tm-qpr-dev