Merge "Fix NPE for CompanionDeviceActivity.setResultAndFinish()" into sc-v2-dev