Merge "Merge "Keeps picker quick pick correct when switching home/lock tabs (2/3)" into udc-dev am: 1cde12bc1c am: 258e4ab131"