Merge "ViewRootImpl: Don't pause HWUI so much" into tm-dev