Merge changes from topic "am-850e8d8f178c4deab0c5779bfd339edb" into qt-dev

* changes:
  [automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am: 50e6566d am: 28046588 -s ours am: c4d132a6 -s ours am: 9c5d78b3 -s ours am skip reason: subject contains skip directive
  [automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: 0fb39a11 am: 3ad36be2 -s ours am: f57a65ed -s ours am: 47de95fe -s ours am skip reason: subject contains skip directive