Merge "Fix some merge issues in repositioning contextual buttons for taskbar/navbar unification" into main