Merge "Add follow up OomAdjuster updates" into main