Merge "Handle letterbox education when disabled" into 24D1-dev