Merge "Do not apply background rules for core uids" into main