Merge "Reset MetadataController view states if null metadata" into pi-car-dev
am: 14e9c5adf8

Change-Id: Ieeebadf37cf5f203111687ecb8d63448f4cc65fc