Merge "Add USE_APPFW define" into devel/master