Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev