Merge "Make sure that invoking handlers is on main thread." into main