Merge "SystemUI:Fix overlapping of sim quicksetting icons"