Merge "ConfirmationPrompt: Update for API review." into pi-dev