Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev am: 9f401d66a6
am: f578d657ae

Change-Id: I5cd1f1cd22bf301bbb1414ba6e14130c8594a99d