changes used to merge e4.ui into platform.ui
22 files changed