Merge "Fix crash when Assist app does not have settings activity." into oc-dev