Merge "surfacefligner: revert recent BE/FE split changes"