Merge "Barrier turn on/off-add switcher value to Config-Subsystem" into stable/lithium