Merge changes from topics "FK_remove_qs_flag", "FK_remove_qs_flag_2" into sc-dev

* changes:
  Remove QS flag
  Fold in QS overlay resources and set flag to true