Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev