Merge changes I8fca0e6f,I7fb46a09 into main

* changes:
  [CS] Remove CentralSurfaces screen pinning methods.
  Update NavBarController's CommandQueue callbacks to be separate.