Merge "Don't rely on focus change to detect edit-type selection."