Merge "[HWUI] Add null check for CanvasContext" into rvc-dev am: c2e20c4b am: cc897ac8 am: fa837325 Change-Id: I62576afe11ef152313942924313cb313c3fb322b