Merge changes from topic "169634969" into sc-dev

* changes:
  Exclude database rows with pending metadata update in default query
  Add QUERY_ARG_DEFER_SCAN systemApi