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

Change-Id: Ie56ffbcb0d89fb5bc15c32d2438185420b082a4c