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