Merge "Call onDisplayChanged even if hbmMetadata is null" into main