Merge "Set proper stack in WM when activity is moved to stack in AM"