Merge changes I6b4df388,I07becea2 into sc-dev

* changes:
  Fix screenshot->long screenshot transition in RTL
  Fix LSS->Markup transition in RTL