Merge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev