Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev