Merge "Fix built-in controller registration flow."
tree: 162b15d0819eb39b9a6108b42c06f95c2e6b2695
  1. acts/