Merge "Add missing finish() calls to multithread and multi context tests." into mnc-dev