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

Change-Id: I329aa9a9e953d37f190144a6b3bfbad22eb82a4b