Merge "Check if returned surface params are null before adding them for surface transform" into ub-launcher3-master