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
Change-Id: I8f192780610c949ddb9b4bf119b931951bad6c36