Pushed to core-updates and then cherry-picked into wip-gnome.