Merge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9
am: ae4d8c9a73

Change-Id: Ic752304dc8191bf42eba98a7f7f64fd12b13f22d