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

* changes:
  Merge changes from topic "aris-revert-resubmit-sc" into sc-dev am: c8c419d53f am: 4baf5c10e2 am: 2d80624cd8 am: 694c0658ec am: 4593596a9a am: 0f58ef4f65 am: c8ad87ef21
  [automerger skipped] Make Activites touch opaque - DO NOT MERGE am: a418847bb8 am: 9571a17507 -s ours am: 2f9a17d078 -s ours am: f736795e8c -s ours am: 00f42d0dd3 -s ours am: 034924c8c2 -s ours am: 3004f89cd0 -s ours