Merge "Protect against null drawable" into qt-dev
am: 85e35eb118

Change-Id: I77df350f236f1c623d41ff777e3ceaef26ee09ef