Merge "Skip user consent for subsequent reports" into main