Merge "Fix bug 5037537 - Revert "ListView focus bugfix.""