Merge "Separator width" into pi-dev