Merge "Implement visual spec for screenshots corner flow"