Merge "Use main thread when creating internet signal icon" into main