Merge changes I71e4943d,Ia942c85d into main

* changes:
  PointerController: Simplify display info listener registration
  PointerController: Get initial DisplayInfos from SurfaceComposerClient