Merge "Launcher3Go should override Launcher3QuickStep" am: 08fa0914a4 am: e723daa0d0
am: 2b9859e8c1

Change-Id: I29daf8c8a8538a30931d4c1ffb4fb83e3f06b75c