Merge "SurfaceFlinger: use setActiveConfigWithConstraints"