Merge "Add MARGIN and PADDING property in Control" into devel/master