Merge "Change Developer Options search to be single-line" into tm-qpr-dev