Merge "Disable app pinning when emergency call button pressed" into nyc-dev