Merge "Move work notification settings back to bottom" into oc-mr1-dev