Merge "Fix notification text not wrapping and clipping switch." into oc-dev