Merge "Move dvr config data from display manager to display service"