Merge "Add EXTRA_SKIP_UI to skip the confirmation page."