Merge "Don't run the async query if being rendered in EditMode." into klp-dev