Merge "Cut down on deadlocks in invalidatePages()"