Merge "ViewPropAnimRT fixes"