cherry-pick '[CDE-403]: Edit/Add fields doesn't change focus'