Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1