Navring: Fix landscape for phones and 4+ targets

Change-Id: Id8004342007d298f1cb1815ab073ea6129782ad4
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Merge "Navring: Fix landscape for phones and 4+ targets" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1