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

Change-Id: I4c59f82c4b930f7e33e95440c470f635aec88c7c