automerge: e3b07b4
* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
[ActivityManager] Use synchronized to protect object
automerge: e3b07b4
* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
[ActivityManager] Use synchronized to protect object