Merge "sysui: refactor for extensibility" into nyc-dev
am: 0997bc8

* commit '0997bc8a85c7d7a83e0f590432d10fab89f2c900':
  sysui: refactor for extensibility