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

* commit '6e796b2e490d422381211a790ab02ae54b0fff5f':
  Fix 3369762: long press should take you into customization mode