Merge "Update triggering logic for hybrid notification" into pi-dev