Merge "Mark testLaunchPendingActivityOnSecondaryDisplay as flaky"