Merge "Fix CS external dependencies on SystemUI" into sc-dev