ENYO-489 (2.5.2-pre.9)

Merging changes from https://github.com/enyojs/moonstone/pull/1771 into `release-2.5.2-pre.9`, creating PR for tracking purposes.