Merge "display: changes for mr2 bringup"