Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev