Merge "Remove double application of surface params" into ub-launcher3-master