Merge "Merging some notification dots implementation" into main