Merge "Clarify javadoc for ACTION_LONG_CLICK" into sc-dev