Merge "Always render the device entry icon white in AOD" into main