Merge "Use safe access to OnPreDrawListener." into nyc-support-25.1-dev
am: 92e85c8fd3

Change-Id: I530042be0e4fa80d33bb8724a52f5ee83d929ca3