Merge "Keeps picker quick pick correct when switching home/lock tabs (2/3)" into udc-dev