Merge "sysui: refactoring qs for extensibility" into nyc-dev