Allow suppressing the automatic okay button.

Change-Id: Ibefa3d67621d528e915d7eda6011b994e02703a4
Merge "Allow suppressing the automatic okay button."