Merge "Update enter pip focus change test"