Merge "Make Extra Dim main toggle and shortcut searchable" into main