Merge "Post screenshot removeWindow call if necessary" into 24D1-dev