Merge "Fix network name not showing in QS sometimes" into mnc-dev