Fixed merge mistakes
Merge branch 'KitchenSink-Tizen' of https://github.com/ihor-r/KitchenSink into KitchenSink-Tizen