Merge "Re-compute oom adj in case cycles are found in partial update" into sc-dev