Merge "Add focus change assertions to FlickerTest"