Merge "Ensure that we use the current user context when adding nav mode listeners" into qt-dev am: d76c0d75 am: 2d7c9546 Change-Id: Ie03c7c3f0b29d958a347d9180395b9f78d79081d