Merge "Resolve the flicker and visibility issues by AodBurnInLayer Use refreshBlueprint to apply constraints to clock and smartspace" into main