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: I98b38e3de8394e9b84d960b3a923aad6b7e47d2e