Merge "SurfaceFlinger: Don't handle effects if a buffer is available"