am 02e4d4d4: (-s ours) am 601eadd8: Remove onPreDrawListener logic

* commit '02e4d4d4519282032536870e1dd63cb8fc3b99c3':