Merge "Move dismiss animation into ScreenshotView"