Fix shortcut componentname in workspace layout logging am: b0738b0739 am: 132b38ab3f

Change-Id: I4b7152266c9252e06500e285ced14e90f4b04389