Font.xml merge fix
DialogPVRChannelsOSD.xml merge fix