Merge "Update ViewLocationHolder#compareTo to properly implement Comparable"