Merge "Focus on the right pane when choosing an app on left" into main