Merge "Recover dataset picker when view fail to autofill." into pi-dev am: 828ffa45a1
am: f10983fbe7

Change-Id: I8cbae3ab05a79fc9358a787af32887d9968370b6