Merge "Fixing missed call badge query" into nyc-dev