Merge "Fix indexing in cast and zen mode settings"