Merge "Fix bug with swiping up on dreams to dismiss." into main