Merge "Prevent the bouncer from showing over dreams when swiping down the shade." into tm-dev