Merge "Fix issue where incoming call shows up while handing over call."