Merge "Updating Launcher rotation logic" into ub-launcher3-master