Merge "[4.0] Fix ImageView OnRelayout and add a commnet in MARGIN property" into...