DO NOT MERGE Fix NPE that occurs with poorly behaved widgets

Bug #5587311

Change-Id: Ie81ec8b819a757298f563267824c74ee0fc55087
1 file changed