Merge "Letterbox: make letterbox work with drag resizing" into pi-dev