Merge "DALi Version 1.0.17" into tizen