Merge "ChangeScreen: Avoid race condition for revision changes"