Merge "Add extra logging for Assert.isMainThread"