Merge "Change back navigation impl to rely on observer" into main