Merge changes I607d96f9,I5e0fca2f,Ife5d4d89 into main

* changes:
  Remove dead code from NIC + SBIV
  Replace NIC#setInNotifIconShelf
  SysUITestModule utilities