Merge "Remove Feedback UI Settings" into sc-dev