Merge "Prevent settings from crashing when ContentProvider crashes" into oc-dev