Merge "Revert "Update display contents when metrics change""