Merge "Barrier turn on/off - Split ConnectionAdapter functionality" into stable/lithium