Merge "Fix bug 5339708 - edge case in ListView focus restoration"