Merge "Set frame based on surface control width/height"