Merge changes I3f5144ab,Iefc05dd5 into main

* changes:
  Push global device state to OomAdjuster
  Wrap all state changes that can affect OomAdjuster computation