Merge "Disabling Dialer ringing feature" into nyc-dev