5cc37854d4
Merge commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48' * commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48': Fix many of the ANRs introduced by scheduling classes.