Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails" into rvc-dev