Merge "Fix pip window visibility assertions" into sc-dev