Improve UI map logging (#14397)

Change-Id: I19e3fb3711e6442c4aeddd3f0203dcc1a196ebbe