Merge "Removing SecondaryDisplayLauncher library as it is directly included in Launcher" into ub-launcher3-master