Fix issue with automatic next button when there is an okay button.

Change-Id: I0419a699de722ff4d7f0839a2444bf180d441181
Merge "Fix issue with automatic next button when there is an okay button."