Merge "Allow CBR when device owners is set up"