Merge "Fix error in HDMI and digital dock intent strings"