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

Change-Id: If57d37339fda289c002d154bdf8f3414045ac5e7