Merge "Refactor how we show rotation button in fully gestural mode." into qt-dev