Merge "sdm: Add PictureQuality and RenderIntent attributes in display pluggable"