Merge "Add more layer state changes to SurfaceInterceptor"