Merge "surfaceflinger: fix a nullptr dereference" into oc-dev