Merge "Recover dataset picker when view fail to autofill." into pi-dev