Merge "Separate DTS-MA and DTS-UHD P2 to independent configs"