Set edgeMarginPx back to 8dp. am: 2803200697 am: 3ec4a6109b

Change-Id: I9e0861377b3a03401f1144462f068d5fe20e9d97