Merge "Remove unused onConferenceWith method" into lmp-mr1-dev