Merge "Annotating open-Launcher transition in trace files" into ub-launcher3-master