Improvements in getting workspace app icon
am: 6b466783b7

Change-Id: I47cd2161e5c3b9dd2d2350bcb4606f346d79adf8