Merge change 4438 into donut

* changes:
  Fix many of the ANRs introduced by scheduling classes.