Merge "Unblocking surface sync if the viewroot dies before traversal can happen"