Merge "Fixed null deref when view parent null during invalidation"