Merge "Add clocks to Aod BurnInLayer" into main