Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev