Set edgeMarginPx back to 8dp. am: 2803200697

Change-Id: I60b2924957964782a9e28f4457f1e3577a5e5848