Merge "Fixed ProfileObserver.update race with multiple query threads"