Merge "Ensure device owner changed broadcast completed" into pie-cts-dev