Merge "Fix invalidation bug with View bounds properties"