Merge "Added null checks to LayerDrawable implementation" into qt-dev