Merge "display: External display refactor"