Merge "Ensure that we use the current user context when adding nav mode listeners" into qt-dev am: d76c0d751a
am: e6cdb8e39a

Change-Id: Ief7e875adb5c0d6ad564635d466f6058fc7a813b