Merge changes from topic "single-update-owner-dialog" into main

* changes:
  [pia v2] Show a user confirmation dialog only when update-ownership isn't changed
  Show a user confirmation dialog only when update-ownership isn't changed
  [piav2] Cleanup CL to prepare for single user-confirmation dialog change
  Cleanup CL to prepare for single user-confirmation dialog change