Merge "Fix rotation tile animation" into mnc-dev