Merge "Catch exception when notifying Settings changes." into oc-mr1-dev