Merge "DO NOT MERGE Wait WINDOWS_CHANGED event when a popup is shown" into pie-cts-dev