Merge "Added Lock for mCallbacks and test for Concurrency"