Merge "Fix testable looper threading" into pi-dev