Merge "Prepare for Tizen 4.0 Build" into devel/master