Merge "Fix Crashes on UserCallActivity.onCreate"