Merge "Merge "Hide split options for focused task." into sc-v2-dev am: f2907c6ce3" into sc-v2-dev-plus-aosp