Bug 1046485 - Move search bar out of SearchFragment 

I'll file a follow-up bug to look into this. It seems like ViewSwitchers are mainly used for animating between two different views, but it could be useful to be explicit about only ever showing one of these views. To reduce potential regressions, I think it's best to just keep the layout the same for this refactor.