Merge changes I084b838d,I675b5a91,Ic8ecf64c into main

* changes:
  Merge NSSL and CLOCK migration flags
  Migrate keyguard slice view
  Cleanup - Remove invalid onStart