Merge "Revert "SurfaceFlinger: Emit callbacks for non-buffer layer transactions""