Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev