Merge commit 'eb3af645781d858eea3bccfe193411e23474e11d' * commit 'eb3af645781d858eea3bccfe193411e23474e11d': Use the media.enable1026 system property to indicate whether the