Merge "Move the waiting for the publishing of content provider to client side"