Merge "Unmute emergency calls when they connect." into klp-dev