Merge "[CS] Remove SystemUIBinder, have modules be directly included." into main