Merge "Fix for b/129240060 - updating landsape volume dialog layout to use the newly created CaptionsIcon view."