Merge "Not using dropbox entries before the test start for diagnostics" into ub-launcher3-master