Merge "Revert "Support keyboard long-press on notifications"" into oc-mr1-dev