Merge changes from topic "b168904199-qs-injection"

* changes:
  2/N Remove last injection from QSCustomizer
  1/N Add QSCustomizerController