Merge "confirmationui: explicitly declare only one thread." into pi-dev