Merge "Match taskbar edge padding to nav button end insets" into main