Merge "DALi Version 1.0.31" into tizen