Merge "Wait to unlock before changing notification importance" into oc-dev