Merge "SurfaceFlinger: Null guard for setRelativeLayer" into sc-dev