Merge "Fix race when refreshing message waiting indicator" into mnc-dev