am 77b812e7: Merge "Cannot swap active and background calls after failing to...
am 77b812e7: Merge "Cannot swap active and background calls after failing to merge." into lmp-mr1-dev
* commit '77b812e7':
Cannot swap active and background calls after failing to merge.