Merge "display: metadata fixes"