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

Change-Id: I3aa9c2da09a1447f79edb6a228f88cdc731bd605