Merge "Add rank & count event to notification clicks and dismisses" into pi-dev