Merge "Update workspace, cell layout, shortcut and widget, and cell size calculations." into tm-dev