Merge "Support two pane design in the Settings app." into sc-v2-dev