Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev