Merge "Auto-adaptive encoder frame resizing logic"