Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-ugly