Merge "Handle insets for letterboxing correctly" into pi-dev