Merge changes If8f56401,I950695c8 into main

* changes:
  Add elements to existing mChannelsList instead of overwriting in setChannels
  Return copies of notification channels and groups instead of the cached entities.