Merge "FocusFinderTest Workarounds..." into froyo