Merge "Extend edges correctly during actual frame encoding also." into experimental