Wait until at least two letters typed before doing search on subtemplates
Merge remote-tracking branch 'upstream/2.10.x+angulareditor' into 2.10.x+angulareditor