Merge "Notify ViewRootImpl when it's safe to modify Canvas." into klp-dev