Merge "Some simple skip-layout optimizations for ImageView" into jb-mr1-dev