Merge "msm: display: matching MDP IOCTL numbers with userspace"