Merge "Add onSaveInstanceState support for GridPicker" into ub-launcher3-master