Merge "Support default hbm metadata for non-internal displays" into tm-qpr-dev