Search fragment focus fix.
Merge remote-tracking branch 'origin/new-dev' into new-dev