Merge "Fix ImageView OnRelayout and add a commnet in MARGIN property" into devel...