Merge "Fix race condition in OomAdjuster." into rvc-dev