Merge changes from topic "am-5e4f3119099c4423b7ccf4fd14920428" into udc-dev

* changes:
  Merge changes from topic "aris-revert-resubmit-sc" into sc-dev am: c8c419d5 am: 4baf5c10 am: 2d80624c am: 694c0658 am: 4593596a am: 0f58ef4f am: c8ad87ef
  [automerger skipped] Make Activites touch opaque - DO NOT MERGE am: a418847b am: 9571a175 -s ours am: 2f9a17d0 -s ours am: f736795e -s ours am: 00f42d0d -s ours am: 034924c8 -s ours am: 3004f89c -s ours