Merge "Rebase history" into tizen_base