Merge "Fixing findNearestArea to account for the padding." into tm-qpr-dev