Merge "Revert "Revert "Change screen rotation animation"""