Merge proposals dependent on lp://qastaging/~kissiel/checkbox/fix-1492322-better-add-comment-button

1. fix-1492322-better-add-comment-button
2. Dependent merge proposals