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

Change-Id: I0c05912150f179db80fc88a392ed9a406c6fff01