Merge "Fix jumping taskbar when tapping on nav handle." into main