Merge "Update transient navigation confirmation wording & behavior" into klp-dev