am 24199873: Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev

* commit '24199873ca3297555909914f92e3cab97169b057':
  Refine implementation of GSM conferences (1/3)