Merge "Fix race condition in device tag testing"