Merge "Adding more events for reproducing race conditions during Launcher start" into ub-launcher3-master