search screen should no longer be a launcher
Merge remote-tracking branch 'origin/master'