Merge "Merge "Keeps picker quick pick correct when switching home/lock tabs (1/3)" into udc-dev am: b6f74e295f am: ebd0e16d58"