Merge "Merge "Ensure that we use the current user context when adding nav mode...
Merge "Merge "Ensure that we use the current user context when adding nav mode listeners" into qt-dev am: d76c0d75 am: 2d7c9546" into qt-r1-dev-plus-aosp
am: aba83b16
Change-Id: Id4ecd2e16aa2c5a45bf01dc941d4c14d2637c101