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

Change-Id: I44fc06d18b963b01ef2c894d515567bb7aac2620