Merge "Move rotate navbar button to the right stack"