Merge "Work around issue #3241701: crash in ActivityThread.handleWindowVisibility"