Merge "Long press on Launcher background no longer  brings up customization tray on XLarge devices"