Merge "Handle case where canvas  is 0x0 for shadows"