Merge "Remove FeedbackHelper" into ub-camera-glacier