Merge branch 'CR_2031_evb_515_DRM_hdmi_720x480_keith.zhao' into 'jh7110-5.15.y-devel'