Merge "Clearer message when failing to draw a SW layer" into mnc-dev