Merge changes I00ac71ac,I7bb6b4b4 into main

* changes:
  Remove unused constructor arguments from NSSLController
  Split the NotificationStackAppearanceRepository into 2 pieces