Merge "Reset MetadataController view states if null metadata" into pi-car-dev