Cherry-picking changes for GF-58436 from 2.3.0-release-candidates branch

Also sync’ing CHANGELOG between branches.

Enyo-DCO-1.1-Signed-Off-By: Gray Norton (gray.norton@lge.com)