Merge "Changing importance should record user locked field." into oc-dev