Merge "Switch Bubble Bar side on navigation mode change to 3 buttons." into main