Merge "Delay transient navigation confirmation prompt." into klp-dev