Merge "Fixing broken tests on 2 and 3 button devices." into ub-launcher3-rvc-dev