Merge "Resolve usage of hidden API in Lists"