Merge "Fixing color mismatch for Launcher3/NexusLauncher" into udc-dev