Merge "Enable DisplayList hack for JB MR2" into lmp-mr1-ub-dev