Merge "Always update view when metadata changes"