Merge "Fix nav-up button in main settings activity."