Merge "Avoid double OomAdjust update for start service." into main