In device view, make "waiting to sync" icon have precedence over "matched" icon