Merge "Mark testCreateRemoveStartingWindow as flaky" into qt-dev
am: 0b42819967

Change-Id: I841e5dea51ddbc2ba10827633d70a7d59b18acd4