Merge "Fix content views not updating"