Merge "Fixing view property invalidation issues"