Merge "Updating workspace outlines for large UI" into ics-mr1