Merge "Fix gesture navigation popup is displaying inconsistently on the System...
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c am: 48596c45 am: 6552b09e
Change-Id: I59eda1d7c4efcb1e51d1e384569327f8fcf999c4