Merge "Move work notification settings back to bottom" into oc-mr1-dev am: 466adba25e
am: a266a2a0c0  -s ours

Change-Id: I03053ee698c00815ae88b8cd8a3c60a28df8849f