sprint 40
Merge pull request #441 from adobe/set-sprint-40

sprint 40
Fixes various Aero drawing issues
Merge pull request #445 from adobe/jeff/fix_aero_9

Fixes various Aero drawing issues
Merge branch 'master' into jeff/cef_1750