Merge "Remove auto-muting code from Telephony" into klp-dev