Merge "sysui: refactor for extensibility" into nyc-dev