Merge "Base: add more thread annotations"