Merge "Prevent blank sim label showing on screen." into main