Merge "hwc2: Fix VTS failure on setActiveConfig() testcase" into display.lnx.5.0