Merge "[devel_3.0_main] Cherry-pick Beautification of appfw/inc soure-code. 80665...