Merge "Initial layout/behaviour for freeform workspace."