Merge "SurfaceFlinger: fix a layer occlusion bug"