Merge "Change screen rotation animation"