Merge "Fix the crash caused by DialpadView's OnPreDrawListener." am: 5b6d823a45
am: e027e72a12

Change-Id: Iac4fbb51419f0697b3925e5388b193d27b3dcbc0