Merge "Make rotate QS tile function as on/off to match circle styling"