Merge "Remove icon name from NR dump" into qt-r1-dev
am: 5843b3a372

Change-Id: I85ba17c8473fcefc1ace0d63dc92567b11123fb5