Merge "FeedbackDialog: Improve alignment"