Merge "Reduce boilerplate in FocusHandlingTest"