Merge "Ensure that we use the current user context when adding nav mode...
Merge "Ensure that we use the current user context when adding nav mode listeners" into qt-dev am: d76c0d75 am: e6cdb8e3
am: 3dad2268
Change-Id: Ibacec2c61852c12a4fac44dcd43dca8da8e5fcfe