Merge "Changes based on API council feedback for performContextClick" into nyc-dev