Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev