Merge "Account for span greater than 1 in getReorderRadius" into tm-qpr-dev