Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev