Merge changes from topic "Feedback UI"

* changes:
  Feedback Inline Setting change
  Feedback UI Improvement 1. Show different icon for different NAS adjustments 2. Fix style issues in dark theme and new S notification UI change