Merge "Fixing some tests for 2-button mode" into ub-launcher3-master