Merge "Fix back button behavior for "App info" when launched by Launcher3." into ub-now-lunchbox