Fix some merge issues in repositioning contextual buttons for taskbar/navbar unification

Fixes: 300849078
Test: Rotate around, and make sure the rotation button stays in the same corner
Change-Id: Ifb7904117f4ae8b28f2d14b27fbb39fe1a82e6ae
2 files changed