Bug 1033686 - Pre-search and post-search are visible at the same time 

Much of the changes are renaming; the substantial changes are:
-     MainActivity.java
-     MainActivityTest.java