Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev am: b8c00934cb
am: 09da1990a7

Change-Id: I54351c8462cb9030d52707d2a8df5b10d36f54fd