Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev