Merge "Running various lifecycle-related tests on main thread"