Merge "Fix various bugs in OomAdjuster" into main