Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev