Merge "Screenshot swipe-dismiss polish"