Merge "Fix possible NPE on delayed Runnable"