Merge "Control Padding and Margin Properties used for layouts" into devel/master