Merge "Verify that params passed to NotifActivityStarter are not null" into main