Merge "Update display metrics with initial density if it is not forced" into main