Fix up ChangeLog and cherry-pick 011d403 from master: fix missing burn-in/preview...