Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev