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

Change-Id: Ibb7ff3720befd42754b5a47ea80d55f84a954d37