Merge "Move profile selector dialog to Settings"