Merge "Update placement of the nav bar in persistent taskbar for 3 button nav" into main