Fix search panel for different navigation alignments.

Change-Id: Iae544a568ed9b62d278d886d9d03a66a1b2049db
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7