Merge "Correct StartingWindowInfo for non-top activity." into sc-dev