Merge "Reattach OomAdjuster rewrite flag" into main