Merge "Fix issue where screen rotations would stop animating."