Bring back Launcher3

Change-Id: I7b90fa3fe6b3983f2fdb0009709c0a0d78db6190