Merge "Merge "Handle letterbox education when disabled" into 24D1-dev am: 9e78e2afca" into main