Merge "Fix encoder range check for frame width and height"