Merge "Remove temporary rollback confirmation toggle"