Merge "Set launch display id to an action performed on BaseQuickStepLauncher"