Merge "Adding debug tracing" into ub-launcher3-qt-r1-dev
am: 8578309f1b

Change-Id: If2f3b4d4a849e94449c4b06a567c12610547fc61