am 7d641de1: am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev

* commit '7d641de1f6ca4af977233220590d1e74be970dab':
  Don't run the async query if being rendered in EditMode.