Merge "Add aconfig flags polite notifications refinements" into main