Merge "Bug 4950070: correct title in Settings"