Merge "Prevent WaitForProperty() from using ~100% of CPU time on 32bit builds"