Merge "Fixing SecondaryDisplay Launcher" into ub-launcher3-rvc-dev am: d8cec211a2

Change-Id: Ibed724ec33a12312e8323d3a734d1bfc1ca586b1