am 3c85ea5e: Merge "Fix 3369762: long press should take you into customization mode" into honeycomb

* commit '3c85ea5e9893e2493c4e7c065d4ced5be7c31dca':
  Fix 3369762: long press should take you into customization mode