Keep editing button should place the cursor back into edit field

Bug: 67510
Change-Id: I13b3baa99f986c89279b5c850a648d9fe38ebcfb
Merge "Keep editing button should place the cursor back into edit field"