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