Merge changes from topic 'xc_remove_shelf'

* changes:
  sysui: remove shelf
  DO NOT MERGE sysui: remove shelf