Merge "framework: fix setDisplayContentSamplingEnabled rc"