Merge "Fix prev expire flow in OomAdjuster." into main