Merge "Fixed the issue that the same album gets duplicated in Gallery3D" into gingerbread