Merge "Revert to ICS screen rotation animation."