Merge "Add name to focusChange assertions"