Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
am: cf6a6d244e

Change-Id: Ic3ac8d59c56cec95357bbecafa60d2228810e61c