Merge changes I737c4091,I89e88479 into sc-dev

* changes:
  Fix screenshot preview border radii
  Fix screenshot preview border in RTL