Merge "Separator width" into pi-dev am: a24ddf58c9
am: 52f11fb74e

Change-Id: I126dfe998f5a8aa7b800834628e81b52835db230