Merge "Annotating hierarchy dump for the error description" into ub-launcher3-qt-dev
am: 43522d25f2

Change-Id: If5870760faa0150f94487ed9acfd7db724f10a4a