Merge "EditPage: Fix duplicate classic toolbar"