Merge "display: Support default xml for two new panels"