Merge "Enable Content Capture for ImageViews by default"