Merge "Fix adaptive brightness not appearing in Settings search"