Merge "Minor fixes to new gallery parsing" into ub-launcher3-master