Merge "sensors: Fix thread-safety + cleanup source code."