Merge "Settings: Remove reference to removed string from manifest."