Merge "Update Assistant entry points on navigation mode change" into sc-v2-dev