Merge "Add an additional lock in the ActivityManagerService" into sc-dev