Merge "SurfaceFlinger: Disable early-release on multi displays" into tm-dev