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