Merge "Keep mRetriever thread-save"