Merge "fix 'int android.view.View.getHeight()' on a null object reference" am: 4add708b91 am: 6a5d589a50
am: 3069e2ba6f

Change-Id: I9ba21d8d6aee9424ffad3fbe2072ef78e3b54455