Merge "Don't count swiping up on the locked shade as a swipe to dismiss." into main