Merge "Making the default launcher rule outer for the Portrait-Landscape one" into ub-launcher3-master