Merge changes I2607fd9f,Ic2950a48,Ia929e443 into main

* changes:
  Button to toggle cross tool sync.
  Different rect shading options.
  Different rect shading options.