Merge "Add userId support for photopicker ItemsProvider#getItems"