Merge "Allow ImageView padding to be set to Zero" into devel/master