Merge "Renaming the constants for activation and long press." into jb-dev