Merge "Add corner flow for screenshots"