Merge "Protect against null drawable" into qt-dev