Merge "Track changes to provider lifecycle"