Merge "Reattach OomAdjuster rewrite flag (attempt 3)" into main