am 55f77f98: Merge "Showing clings only after the intro has completed" into ub-now-porkchop

* commit '55f77f983afeffd2240ccd24d783e6d8d3ab44fd':
  Showing clings only after the intro has completed