Merge "AdapterProperties: Track connection state change from more profiles" into oc-dev