Merge "User cannot reject a waiting call after a switch call fails" am: 3af6219876 am: e3d715a49e

Change-Id: I936e82c073987e4a6ea4cd3344f3c1ad650d3c9f