Merge "Use safe access to OnPreDrawListener." into nyc-support-25.1-dev