Merge proposals dependent on lp://qastaging/~kissiel/checkbox/fix-1491574-continue-button-rename

1. fix-1491574-continue-button-rename
2. Dependent merge proposals