Merge "Allow CBR when device owners is set up" into rvc-qpr-dev