Change changes dialog into X deprecation dialog.
Bump X version to 7.
Merge branch 'x-deprecation' into beta