Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
am: 231b8ae707
am: 7961890fb3
Change-Id: I3c838fa2e46a2d6cddbe12492da0944c31563357
This commit is contained in: