Merge "Use only one BurnInParameters for AoD Burn in" into main