Merge "Tizen Directory Migration" into devel/master