Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev