Merge "Remove dogfooder opt-out via platformcompat" into sc-qpr1-dev