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

Change-Id: I48ff76febe268de8af1b2ccfc8f582e9685f6209