Merge changes I5bdc1f46,Idd24fd51 into sc-dev

* changes:
  Sharesheet style updates
  Update Edit icon.