Merge "Detach OomAdjuster rewrite flag" into main