Merge "AodBurnInLayer now enforces it's translation and scale values during predraw" into main