Merge "Mkae SysUIPlugins its own gradle target." into sc-dev