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

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