Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev