Merge "Follow up CL for controller navigation fix" into sc-v2-dev