Merge "Change the API for setting Notification Actions to be contextual."