Merge changes I221089d1,Ie3c7a665

* changes:
  Fix clipboard overlay in dark mode and RTL
  Rename attrs/files shared between clipboard and screenshots