Merge the tizen patch based on 1.12.2