Merge "Re-enable ViewPropAnimRT"