Merge "hwc2: Couple SetActiveConfig to commit" into display.lnx.5.1