Merge "Create framework for initial content pane focus" into sc-dev