Merge "Fixing bug where missed call notifications were getting clobbered"