Merge "Don't overwrite remote views with null values." into nyc-dev