Merge "Fix notification text not wrapping and clipping switch." into oc-dev am: b05beffabc
am: 1838ed0e85

Change-Id: I236a9b3fd8fee09981e2bb65d75f63cc290b9475