Merge "Temporary fix of PreInitialize, Remove FontClient" into devel/master