Merge "AOD - Burn in adjustments"