Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev