Merge "Move another dashboard UI class to its own package." into sc-dev