cancel menu refactoring: it should be usable from external plugins
Merge branch 'master' into ice-cream-sandwich