Merge "Added null checks to LayerDrawable implementation" into qt-dev
am: 6e4e9817b8

Change-Id: I6c05153db17f73226da4b571b001f19d007e5388