Merge "DALi Version 1.0.40" into tizen