Merge "Don't show search when unsupported" into lmp-mr1-dev