Merge changes If9501500,I321d8023 into main

* changes:
  Smooth burn-in transitions
  Fix AOD icon flicker during GONE->AOD