Merge "display: Fix merge issue in jb_mr1"