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

Change-Id: I91975ffdf757071a86cadd9f5e3a7f141089f86f