Merge "[automerger skipped] Merge "DO NOT MERGE Wait WINDOWS_CHANGED event when a popup is shown" into pie-cts-dev am: c3466412c6 -s ours am skip reason: subject contains skip directive"