Merge "Update a few runnable/handler to use a static class instead of a runnable."