Merge "Fix FocusSearchNavigationTest on API 15."