Merge "Clean up ImageView"