Merge "Fix speakerphone logic when connecting/disconnecting dock." into tm-dev