Merge "Add notification information to logging for ACTION_NOTE_CONTROLS."