Merge "sdm: add content type transition for detail enhancer"