Merge "Don't use AOD device entry icon variant until dozing transition is finished" into main