Merge "mm-video: added a property "persist.vidc.dec.conceal_color""