Fix shortcut componentname in workspace layout logging am: b9ba427576

Change-Id: I6ffef9cc9dabb32e1d6b1a16e7011d3c9b6b9c3b