Merge "Button Refactoring phase 1" into tizen