Merge cm to fix mdp issus

N/A

Change-Id: Id1d89fa75aea5d1f6ad90441a0093552ad03c072
Signed-off-by: huangqiwu <huangqiwu@xiaomi.com>