Merge "Fix NPE from navbar touch cancel without down." into main