Merge "Add wait in testOnWindowFocusChanged." into froyo