Merge "Gallery2: Fix CollectionIncompatibleType"