am f6a47bbc: Merge "Ensure the intro view is always the top view in the draglayer if it is present" into ub-now-mister-ugly

* commit 'f6a47bbc05b7797a85034760b001f0050bf439a8':
  Ensure the intro view is always the top view in the draglayer if it is present