Merge "WatchableImpl: add lock when get the mObservers size." into main