Merge "msm_fb: Correct R and G offsets for correct mapping"