Use safe access to OnPreDrawListener. am: 61c1d4fa04
am: 62f16e3993  -s ours

Change-Id: I307c16bf3da32618b503c1bff868718ddb472f78