Merge "Prepare ActivityManagerService for multiple stacks."