Bug 1045758 - [Rocketbar] Haida cleanup and home search rollup r=vingtetun