Merge "Fix time vs. bytes units bug in getRenderPosition"