ref #6909 Add navigator context listening