Merge changes from topic "aris-revert-resubmit-sc" into sc-dev

* changes:
  Make Activites touch opaque - DO NOT MERGE
  Revert "Make Activites touch opaque - DO NOT MERGE"