Merge "Only wait for significant windows to unfreeze display" into sc-dev