Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev