Merge "Fix bug #12910134 Implement Search into the Settings App"