Merge "Add a few fine-grained locks in the ActivityManagerService" into sc-dev