am cd4af2b5: am 36a62885: Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-ugly

* commit 'cd4af2b5a6024258cc47bcea29adf7e1502097bf':
  Adding in-activity intro screen (issue 12905636)