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: 231b8ae7
Change-Id: I5052a8fa96cd9f455c3193b2d4435e52fb3afec9