Merge "Add action chips to corner screenshot flow"