Merge "Fix NPE for CompanionDeviceActivity.setResultAndFinish()"