more cancel menu refactoring + code cleanup
Merge branch 'master' into ice-cream-sandwich