Merge "[HWUI] Add null check for CanvasContext" into rvc-dev