Merge "Update app lists for adjustment exclusion screens" into main