Merge "Fix NPE printing notification actions." into nyc-dev