Merge changes from topic "am-000ca997c11c4ee48a326e36e38a3bdc"

* changes:
  Merge changes from topic "am-5e4f3119099c4423b7ccf4fd14920428" into udc-dev am: 50ff7b83 am: 7fcb3828
  [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 am: 6533a1fe -s ours am: ead749fd -s ours