Merge "Make final confirmation of dialog only shows in-call state" into main