Merge "SurfaceFlinger: remove a redundant nullptr check" into sc-dev