Merge "Fix spurious ANRs involving window shuffling and non-fullscreen activities"