Merge "Implement the custom style flow part 2" into ub-launcher3-master