Merge "Preserve letterbox while dragResizing" into pi-dev