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