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

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