Merge "Test tweaks for the memory activity recreation test" into ub-launcher3-master