Merge "SurfaceFLinger: rename outLayerId"