Fading in edit button much later

It was causing overlap with the rest of the items, so we're
fading it later now.

Bug: 157175224
Test: visual, expand panel, observe no overlap
Change-Id: I757a3d69fc0cc941eab33279ea85ec9f1e7b547a